Fix conflict Git markers

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=619655

diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 6bb4c2a92bdfa233c186a5d4721eebd76743ba4e..e93f8695dfa2f070cc00cc2db54b7f218da704a9 100644 (file)
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -504,11 +504,7 @@
  *         </listitem>
  *       </varlistentry>
  *       <varlistentry>
-<<<<<<< HEAD
  *         <term><parameter>bookmark_indes</parameter>&nbsp;:</term>
-=======
- *         <term><parameter>bookmark_index</parameter>&nbsp;:</term>
->>>>>>> native-layout-incubator
  *         <listitem>
  *           <simpara>
  *             index of the bookmark to switch to; the indices start at 0.

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 11adb7aa622afdc3f7ea2ef6d2a7c8984509f681..026bb5912f5fde835b20cfe4cc7bad3af28310ae 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -397,15 +397,9 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window)
  * gtk_scrolled_window_new:
  * @hadjustment: (allow-none): horizontal adjustment
  * @vadjustment: (allow-none): vertical adjustment
-<<<<<<< HEAD
  *
  * Creates a new scrolled window.
  *
-=======
- *
- * Creates a new scrolled window.
- *
->>>>>>> native-layout-incubator
  * The two arguments are the scrolled window's adjustments; these will be
  * shared with the scrollbars and the child widget to keep the bars in sync 
  * with the child. Usually you want to pass %NULL for the adjustments, which